From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sat, 5 Feb 2011 09:40:15 +0000 (+0100)
Subject: shell_global_maybe_gc: Call gjs_context_maybe_gc instead of JS_MaybeGC
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~9115
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=32d59861a0053be04add64f98581acd22fedf250;p=gnome-shell.git

shell_global_maybe_gc: Call gjs_context_maybe_gc instead of JS_MaybeGC

This handles native glibc memory allocations better see:
https://bugzilla.gnome.org/show_bug.cgi?id=640790

Also bump the minimum gjs version to 0.7.11

https://bugzilla.gnome.org/show_bug.cgi?id=640781
---

diff --git a/configure.ac b/configure.ac
index 12b4723bd..5c25a604f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
 CLUTTER_MIN_VERSION=1.5.15
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
-GJS_MIN_VERSION=0.7.8
+GJS_MIN_VERSION=0.7.11
 MUTTER_MIN_VERSION=2.91.4
 GTK_MIN_VERSION=2.99.3
 GIO_MIN_VERSION=2.25.9
diff --git a/src/shell-global.c b/src/shell-global.c
index 68ee6190c..ec00690be 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1228,9 +1228,7 @@ shell_global_gc (ShellGlobal *global)
 void
 shell_global_maybe_gc (ShellGlobal *global)
 {
-  JSContext *context = gjs_context_get_native_context (global->js_context);
-
-  JS_MaybeGC (context);
+  gjs_context_maybe_gc (global->js_context);
 }
 
 void